Fixed folder creation on first startup; cleaned up