restructure files and add more styling