Improved layout of files and added deploy script