cleaned up directory moved code to folders