Changed code organizing directories.