Added simple if conditional statement support, restructured dirs