a lot of reorganization of files, no includes in frontpage anymore