Refactoring following Shawn's comments

Solving Shawn's issues #31
Deleting script folder