Updated file structure. TODO: figure out why active class isn't updating after initial load.