Cleaned up folder structure