UserController Testing and Some Small Fixes

Directory Structure, Some copy errors.