Commiting files sent earlier + directory setup

Should be as was sent over skype