change folder structure to make code reading easier