Added package structure
rm old main files
Added new test file