Clean up project strucutre

Better and more standardized project structure