added better directory structure and commenting in layout
better
fixed typo in gitignore
fixed dumb merging