Not depending on Cmake. Some more directory structure changes