new clean file structure and naming