Move APCommandExecutor and fix package names

Move the APCommandExecutor to the main package and fix package names.