renamed files and classes to fit naming convention, fixed controller method bug for completion