Changed directory structure and name of implementation module