Source refactoring
Working with Takipi's backend