restructered + cleaned up files