change project structure to match the current standards