Moved other files into separate folders