File structure improvement / CSS base changes