Change directory structure to compile

Done by Shervin