more layout & file structure, added colors