folder cleanup and bug fixing