Grouped files into directories, cleaned up unnecessary stuff