file structure reviewed and frontpage ready