Cleaned up references
Cleaned up the code, renamed files.