Reorganize project - move code to Indicators