Add some classes from storm-starter project and renamed some packages