Placed code into appropriate folders

Fixed up code and placed into separate folders based on the type of
file.