Cleaned up all structure
Added tests
Added first test
cleanup