Active component colour, file reorganization

Switched active component colour from yellow to red on suggestion,
reorganized some files