Cleaned up + added directory listings + extensions