changing paths so more organized