Revert "reincluded the folders into the project, changed the visibility fo the screen classes"

This reverts commit 8bd92d78b4f1f6312812cc1c8b06e533952487bb.