seperated clazsses in files; fixed folder page links