13/07/29 - Changed directory structure
Changed directory structure to have more folder; adapted source code for new structure