Import

Added code from previous project and did some general renaming of files
to make everything cleaner.