reworked directory structure/ui layout