reorganized everything again... should work with multiple computers now