Organize project slightly, clean html