Reorganize files, remove unneeded ones