Initial unit tests. Moved source files into packages