Initial commit. Need to rework directory structure