Code cleanup + new sources tree