adjusted file structure for use with my components setup