updated string formatting in velocity script, updated readme and reorganized repo