Re-did file structure