Cleaned up files, renamed Pinky to Controller