Removed datasources and package refactoring