moving code into more specific folders