V2

Started Branch V2.
- Code formatting.
- Testing for eclipse.