restructured folders, renamed files for clarity