Further Cleaning up project structure