Cleaned up folder structure for GitHub