modify class and id names, added better file structure