organized directories
updated project & includes to refer to new directories