Moved classes to new package and added basic abstract Screen implementation