Cleaned up project layout.