added new main files to src/ and test/