Moved classes to a seperate dir - non intent classes