Added bound condtions - moved everything to lib
Changed directory name