Cleaned up content/ folder, put everything into folders