Restructured directory layout and added to gitignore. Updated code to reflect new directories