enhance load speed and cleaned file structure