'primitives' folder, rearranging files