re-arranged and cleaned up files