Reorganize folder
Remove unnecessary code