Changing dir structure to make compiling easier