Move into basic include structure and compact css