Adding Users objects and further refining file organization
Adding References. Refactoring common code to core classes