Better folder structure, hopefully it still compiles