Basic cleanup and organize directory structure.