fixing controller and general move
changed structure to deployable module