some restructuring
initial dropbox stuff