Re-organized folders to remove spaces for make