Cleaned up organization using html and data folder