Reorganize folder structure (build system is not updated)