Moved some source to a separate folder