Moved content provider to main source folder