restructured project with file hierarchy magic