Stateful timeline

- fixed some stateful timeline bugs
- Splitted stateful timeline into new java class file
- Refactoring timeline