Added new folders, did some cleanup