Cleaned up folder organization