Resource class moved to it's own file