cleaned up directories, renamed for better consistency etc