Rearranged directory struct to project specs