Moved screen to their own package
Removed unnecassary files