cosmetic changes in style and files organization..