More GUI stuff and organizing files