Clean up

Cleaned up refs and file structure