Cleaned up folder organisation