directory clean up and styling changes