cleaned up and organized directory