Reorganize project layout
Remove unnecessary code