First implementation
Changed directory structure