Initial commit

Project cleanup