restructure files, work on css class structure